Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 Jan 2012 20:10:40 +0000 (12:10 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 Jan 2012 20:10:40 +0000 (12:10 -0800)

Trivial merge